gdk: Select the X11 backend a the last possible backend

On Windows and OS X we want to prefer the native backends over the X11
backend.
On Linux, nothing changes as nobody is going to enable those backends
(and if they do, they'll know what they get).

diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 508d60910b7abe5284c05800fdcd93270d7ef2fd..1c442045f9e04ba3eb06419ec1e41c2e723c221b 100644 (file)
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -225,11 +225,6 @@ gdk_display_manager_get (void)
       const gchar *backend;
 
       backend = g_getenv ("GDK_BACKEND");
-#ifdef GDK_WINDOWING_X11
-      if (backend == NULL || strcmp (backend, "x11") == 0)
-        manager = g_object_new (gdk_x11_display_manager_get_type (), NULL);
-      else
-#endif
 #ifdef GDK_WINDOWING_QUARTZ
       if (backend == NULL || strcmp (backend, "quartz") == 0)
         manager = g_object_new (gdk_quartz_display_manager_get_type (), NULL);
@@ -239,6 +234,11 @@ gdk_display_manager_get (void)
       if (backend == NULL || strcmp (backend, "win32") == 0)
         manager = g_object_new (gdk_win32_display_manager_get_type (), NULL);
       else
+#endif
+#ifdef GDK_WINDOWING_X11
+      if (backend == NULL || strcmp (backend, "x11") == 0)
+        manager = g_object_new (gdk_x11_display_manager_get_type (), NULL);
+      else
 #endif
       if (backend != NULL)
         g_error ("Unsupported GDK backend: %s", backend);